bitkeeper revision 1.1250 (42388967abs8cSqOtVzsPvhEiltK5Q)
authorrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 16 Mar 2005 19:30:47 +0000 (19:30 +0000)
committerrneugeba@wyvis.research.intel-research.net <rneugeba@wyvis.research.intel-research.net>
Wed, 16 Mar 2005 19:30:47 +0000 (19:30 +0000)
commite5694619ceeff3b36f46bc96856c2744cb367ea0
treeaafac2367b85e9596a81f911c4197615419a036c
parent4f6133288a786d887c86485e79bb301ded322465
bitkeeper revision 1.1250 (42388967abs8cSqOtVzsPvhEiltK5Q)

fixed manual merge error

Signed-off-by: michael.fetterman@cl.cam.ac.uk
xen/include/asm-x86/mm.h
xen/include/xen/perfc_defn.h